Auto merge of #3299 - alexcrichton:fix-tests, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 17 Nov 2016 20:45:11 +0000 (12:45 -0800)
committerGitHub <noreply@github.com>
Thu, 17 Nov 2016 20:45:11 +0000 (12:45 -0800)
commitb7be4f2ef2cf743492edc6dfb55d087ed88f2d76
tree7170548afa5bace5bd965925fb96e275596fd150
parent2ffc035a1a35cea4cbf1cc16da7b85e6043f3d4d
parent0a78e431d6ca8e3095a6efe54f4082325b8aea9f
Auto merge of #3299 - alexcrichton:fix-tests, r=alexcrichton

Fix tests on nightly